Bump version. Attemps to fix deployment issues on Windows.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4767 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/configure b/gpsbabel/configure
index a897abae0436486d1459497c1356b3c88a1b3a50..41d73a253756a9c2185784582a9c11e57c019849 100755 (executable)
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.0-beta20140214.
+# Generated by GNU Autoconf 2.69 for GPSBabel 1.5.0-beta20140302.
 #
 # Report bugs to <BUG-REPORT-ADDRESS>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GPSBabel'
 PACKAGE_TARNAME='gpsbabel'
-PACKAGE_VERSION='1.5.0-beta20140214'
-PACKAGE_STRING='GPSBabel 1.5.0-beta20140214'
+PACKAGE_VERSION='1.5.0-beta20140302'
+PACKAGE_STRING='GPSBabel 1.5.0-beta20140302'
 PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
 PACKAGE_URL=''
 
@@ -1283,7 +1283,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GPSBabel 1.5.0-beta20140214 to adapt to many kinds of systems.
+\`configure' configures GPSBabel 1.5.0-beta20140302 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1349,7 +1349,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GPSBabel 1.5.0-beta20140214:";;
+     short | recursive ) echo "Configuration of GPSBabel 1.5.0-beta20140302:";;
    esac
   cat <<\_ACEOF
 
@@ -1449,7 +1449,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GPSBabel configure 1.5.0-beta20140214
+GPSBabel configure 1.5.0-beta20140302
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1765,7 +1765,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GPSBabel $as_me 1.5.0-beta20140214, which was
+It was created by GPSBabel $as_me 1.5.0-beta20140302, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5475,7 +5475,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GPSBabel $as_me 1.5.0-beta20140214, which was
+This file was extended by GPSBabel $as_me 1.5.0-beta20140302, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5537,7 +5537,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GPSBabel config.status 1.5.0-beta20140214
+GPSBabel config.status 1.5.0-beta20140302
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in
index 9f8b293f9e95bff576ef56472c44ddaf113acbd9..b6fa4071507047ce67695c932f7e2fe131a6e664 100644 (file)
--- a/gpsbabel/configure.in
+++ b/gpsbabel/configure.in
@@ -6,7 +6,7 @@ AC_PREREQ(2.59)
 #AC_INIT(GPSBabel, 1.4.4, BUG-REPORT-ADDRESS)
 #DOCVERSION=1.4.4
 #PACKAGE_RELEASE=
-AC_INIT(GPSBabel, 1.5.0-beta20140214, BUG-REPORT-ADDRESS)
+AC_INIT(GPSBabel, 1.5.0-beta20140302, BUG-REPORT-ADDRESS)
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
 DOCVERSION=development
 

diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h
index 6f5d228f6147453bbb9462d0ff8968df5a83c8bd..4878d907fa1741fbb84d0a809d31c3744fe771b8 100644 (file)
--- a/gpsbabel/gbversion.h
+++ b/gpsbabel/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.5.0-beta20140214"
+#define VERSION "1.5.0-beta20140302"
 #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development"

diff --git a/gpsbabel/gui/makesetup.bat b/gpsbabel/gui/makesetup.bat
index ebe3039ef66f388fea79986e34e8f225553f8dcd..8da542db2276c5052618abbebce2413bf8486e64 100644 (file)
--- a/gpsbabel/gui/makesetup.bat
+++ b/gpsbabel/gui/makesetup.bat
@@ -24,8 +24,11 @@ copy %QTDIR%\bin\Qt5Webkit.dll qtdir\bin
 copy %QTDIR%\bin\Qt5Xml.dll qtdir\bin\r
 copy %QTDIR%\bin\Qt5Network.dll qtdir\bin\r
 rem copy %QTDIR%\bin\mingwm10.dll qtdir\bin\r
+# Because *obviously* libraries should live in the bin directory...\r
+copy %QTDIR%\bin\libwinpthread*.dll qtdir\bin\r
+copy %QTDIR%\bin\libgicu*.dll qtdir\bin\r
+copy %QTDIR%\bin\libgstdc++*.dll qtdir\bin\r
 copy %QTDIR%\bin\libgcc_s_dw2-1.dll qtdir\bin\r
-rem copy %QTDIR%\bin\phonon.dll qtdir\bin\r
 \r
 rem Image format plugins needed at runtime, but not debug verions\r
 xcopy %QTDIR%\plugins\imageformats qtdir\plugins\imageformats\r

diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss
index 6dacfe0622354b19bf06a48b8327a499dd22bc18..b4530ef8d37092af7d8f85d89f3d5e68782b6f85 100755 (executable)
--- a/gpsbabel/gui/setup.iss
+++ b/gpsbabel/gui/setup.iss
@@ -1,85 +1,85 @@
-;\r
-; NOTE: setup.iss is generated from setup.iss.in via autoconf.\r
-; The generated setup.iss is checked in to help keep the version numbers\r
-; synchronized.\r
-;\r
-; Script for generating installation setup program for GPSBabel\r
-; Uses the Inno setup compiler.  Typically used from the command\r
-; line "makesetup.bat" which copies QT system files which\r
-; the Innosetup compiler cannot handle.  \r
-;\r
-; So it is not a good idea to run this file from the Inno Setup GUI.\r
-\r
-[Setup]\r
-; NOTE: The value of AppId uniquely identifies this application.\r
-; Do not use the same AppId value in installers for other applications.\r
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)\r
-AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017}\r
-AppName=GPSBabel\r
-AppVerName=GPSBabel 1.5.0-beta20140214\r
-AppPublisher=GPSBabel\r
-AppPublisherURL=http://www.gpsbabel.org\r
-AppSupportURL=http://www.gpsbabel.org\r
-AppUpdatesURL=http://www.gpsbabel.org\r
-DefaultDirName={pf}\GPSBabel\r
-DefaultGroupName=GPSBabel\r
-OutputDir=release\r
-OutputBaseFilename=GPSBabel-1.5.0-beta20140214-Setup\r
-SetupIconFile=images\babel2.ico\r
-Compression=lzma\r
-SolidCompression=yes\r
-LicenseFile=COPYING.txt\r
-\r
-[Languages]\r
-Name: "english"; MessagesFile: "compiler:Default.isl"\r
-\r
-[Tasks]\r
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked\r
-\r
-[Files]\r
-; This isn't as wreckless as it seems; these directories are populated on a\r
-; controlled way by the batch file.\r
-Source: qtdir\bin\*.dll;               DestDir: "{app}"; Flags: ignoreversion\r
-Source: qtdir\plugins\*;               DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-\r
-Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion\r
-Source: qt.conf;                               DestDir: "{app}"; Flags: ignoreversion\r
-\r
-Source: \gpsbabel\gui\release\gpsbabelfe.exe;  DestDir: "{app}"; Flags: ignoreversion\r
-;Source: release\libexpat.dll;         DestDir: "{app}"; Flags: ignoreversion\r
-Source: \gpsbabel\gpsbabel\release\gpsbabel.exe;       DestDir: "{app}"; Flags: ignoreversion\r
-; Source: release\help\*;              DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-\r
-; Translation strings extracted from source code.  Include it in the dist\r
-; so that users can translate if they want to. \r
-; Source: gpsbabel_*.ts;               DestDir: "{app}\translations"; Flags: ignoreversion \r
-; Source: gpsbabelfe_*.ts;             DestDir: "{app}\translations"; Flags: ignoreversion \r
-\r
-; Compiled translation strings that are used at runtime.\r
-; Source: gpsbabel_*.qm;               DestDir: "{app}\translations"; Flags: ignoreversion \r
-Source: gpsbabelfe*.qm;                DestDir: "{app}\translations"; Flags: ignoreversion \r
-\r
-; Now translations from Qt's own UI stuff.\r
-Source: qtdir\translations\*;                  DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs\r
-\r
-; Miscellaneous\r
-Source: COPYING.txt;                   DestDir: {app}; Flags: ignoreversion\r
-; Source: AUTHORS;                     DestDir: {app}; Flags: ignoreversion\r
-; Source: README.contrib;                      DestDir: {app}; Flags: ignoreversion\r
-; Source: README.gui;                  DestDir: {app}; Flags: ignoreversion\r
-\r
-\r
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files\r
-\r
-[Icons]\r
-Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"\r
-Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon\r
-\r
-[Run]\r
-Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent\r
-\r
-[Registry]\r
-Root: HKCU; Subkey: "Software\GPSBabel"; Flags: uninsdeletekeyifempty\r
-Root: HKCU; Subkey: "Software\GPSBabel\GPSBabel"; Flags: uninsdeletekey\r
-Root: HKCU; Subkey: "Software\GPSBabel\GPSBabelFE"; Flags: uninsdeletekey\r
-\r
+;
+; NOTE: setup.iss is generated from setup.iss.in via autoconf.
+; The generated setup.iss is checked in to help keep the version numbers
+; synchronized.
+;
+; Script for generating installation setup program for GPSBabel
+; Uses the Inno setup compiler.  Typically used from the command
+; line "makesetup.bat" which copies QT system files which
+; the Innosetup compiler cannot handle.  
+;
+; So it is not a good idea to run this file from the Inno Setup GUI.
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017}
+AppName=GPSBabel
+AppVerName=GPSBabel 1.5.0-beta20140214
+AppPublisher=GPSBabel
+AppPublisherURL=http://www.gpsbabel.org
+AppSupportURL=http://www.gpsbabel.org
+AppUpdatesURL=http://www.gpsbabel.org
+DefaultDirName={pf}\GPSBabel
+DefaultGroupName=GPSBabel
+OutputDir=release
+OutputBaseFilename=GPSBabel-1.5.0-beta20140214-Setup
+SetupIconFile=images\babel2.ico
+Compression=lzma
+SolidCompression=yes
+LicenseFile=COPYING.txt
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+; This isn't as wreckless as it seems; these directories are populated on a
+; controlled way by the batch file.
+Source: qtdir\bin\*.dll;               DestDir: "{app}"; Flags: ignoreversion
+Source: qtdir\plugins\*;               DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+Source: gmapbase.html;                         DestDir: "{app}"; Flags: ignoreversion
+Source: qt.conf;                               DestDir: "{app}"; Flags: ignoreversion
+
+Source: \gpsbabel\gui\release\gpsbabelfe.exe;  DestDir: "{app}"; Flags: ignoreversion
+;Source: release\libexpat.dll;         DestDir: "{app}"; Flags: ignoreversion
+Source: \gpsbabel\gpsbabel\release\gpsbabel.exe;       DestDir: "{app}"; Flags: ignoreversion
+; Source: release\help\*;              DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+; Translation strings extracted from source code.  Include it in the dist
+; so that users can translate if they want to. 
+; Source: gpsbabel_*.ts;               DestDir: "{app}\translations"; Flags: ignoreversion 
+; Source: gpsbabelfe_*.ts;             DestDir: "{app}\translations"; Flags: ignoreversion 
+
+; Compiled translation strings that are used at runtime.
+; Source: gpsbabel_*.qm;               DestDir: "{app}\translations"; Flags: ignoreversion 
+Source: gpsbabelfe*.qm;                DestDir: "{app}\translations"; Flags: ignoreversion 
+
+; Now translations from Qt's own UI stuff.
+Source: qtdir\translations\*;                  DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs
+
+; Miscellaneous
+Source: COPYING.txt;                   DestDir: {app}; Flags: ignoreversion
+; Source: AUTHORS;                     DestDir: {app}; Flags: ignoreversion
+; Source: README.contrib;                      DestDir: {app}; Flags: ignoreversion
+; Source: README.gui;                  DestDir: {app}; Flags: ignoreversion
+
+
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"
+Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent
+
+[Registry]
+Root: HKCU; Subkey: "Software\GPSBabel"; Flags: uninsdeletekeyifempty
+Root: HKCU; Subkey: "Software\GPSBabel\GPSBabel"; Flags: uninsdeletekey
+Root: HKCU; Subkey: "Software\GPSBabel\GPSBabelFE"; Flags: uninsdeletekey
+